From ba02f6679cd3be5ec47c09a72144eced474048a8 Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Wed, 16 Mar 2022 21:02:15 -0500 Subject: [PATCH] Glogbook, Gnav_trl --- CMakeLists.txt | 2 -- GPSBabel.pro | 2 -- glogbook.cc => deprecated/glogbook.cc | 0 gnav_trl.cc => deprecated/gnav_trl.cc | 0 reference/format0.txt | 2 -- reference/format1.txt | 2 -- reference/format2.txt | 2 -- reference/format3.txt | 4 --- reference/help.txt | 2 -- testo.d/glogbook.test | 11 ------- testo.d/gnav_trl.test | 10 ------ vecs.cc | 11 ------- xmldoc/formats/glogbook.xml | 9 ------ xmldoc/formats/gnav_trl.xml | 45 --------------------------- 14 files changed, 102 deletions(-) rename glogbook.cc => deprecated/glogbook.cc (100%) rename gnav_trl.cc => deprecated/gnav_trl.cc (100%) delete mode 100644 testo.d/glogbook.test delete mode 100644 testo.d/gnav_trl.test delete mode 100644 xmldoc/formats/glogbook.xml delete mode 100644 xmldoc/formats/gnav_trl.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index 77f91f528..97364fb4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,8 +102,6 @@ set(ALL_FMTS ${MINIMAL_FMTS} ggv_log.cc ggv_ovl.cc globalsat_sport.cc - glogbook.cc - gnav_trl.cc googledir.cc gpssim.cc gtm.cc diff --git a/GPSBabel.pro b/GPSBabel.pro index 4a8a9f9c3..5c9843cd0 100644 --- a/GPSBabel.pro +++ b/GPSBabel.pro @@ -77,8 +77,6 @@ ALL_FMTS = $$MINIMAL_FMTS \ ggv_log.cc \ ggv_ovl.cc \ globalsat_sport.cc \ - glogbook.cc \ - gnav_trl.cc \ googledir.cc \ gpssim.cc \ gtm.cc \ diff --git a/glogbook.cc b/deprecated/glogbook.cc similarity index 100% rename from glogbook.cc rename to deprecated/glogbook.cc diff --git a/gnav_trl.cc b/deprecated/gnav_trl.cc similarity index 100% rename from gnav_trl.cc rename to deprecated/gnav_trl.cc diff --git a/reference/format0.txt b/reference/format0.txt index 2b7a1e2a4..185428c9e 100644 --- a/reference/format0.txt +++ b/reference/format0.txt @@ -23,7 +23,6 @@ gpssim gpssim Franson GPSGate Simulation fugawi txt Fugawi garmin301 Garmin 301 Custom position and heartrate garmin_g1000 csv Garmin G1000 datalog input filter file -glogbook xml Garmin Logbook XML gdb gdb Garmin MapSource - gdb garmin_txt txt Garmin MapSource - txt (tab delimited) garmin_poi Garmin POI database @@ -41,7 +40,6 @@ dg-200 GlobalSat DG-200 Download globalsat GlobalSat GH625XT GPS training watch googledir xml Google Directions XML kml kml Google Earth (Keyhole) Markup Language -gnav_trl trl Google Navigator Tracklines (.trl) land_air_sea txt GPS Tracking Key Pro text gtm gtm GPS TrackMaker arc txt GPSBabel arc filter file diff --git a/reference/format1.txt b/reference/format1.txt index 16a7776e6..d7245d336 100644 --- a/reference/format1.txt +++ b/reference/format1.txt @@ -26,7 +26,6 @@ file gpssim gpssim Franson GPSGate Simulation file fugawi txt Fugawi file garmin301 Garmin 301 Custom position and heartrate file garmin_g1000 csv Garmin G1000 datalog input filter file -file glogbook xml Garmin Logbook XML file gdb gdb Garmin MapSource - gdb file garmin_txt txt Garmin MapSource - txt (tab delimited) file garmin_poi Garmin POI database @@ -46,7 +45,6 @@ serial dg-200 GlobalSat DG-200 Download serial globalsat GlobalSat GH625XT GPS training watch file googledir xml Google Directions XML file kml kml Google Earth (Keyhole) Markup Language -file gnav_trl trl Google Navigator Tracklines (.trl) file land_air_sea txt GPS Tracking Key Pro text file gtm gtm GPS TrackMaker file arc txt GPSBabel arc filter file diff --git a/reference/format2.txt b/reference/format2.txt index 268d82607..96eedebc5 100644 --- a/reference/format2.txt +++ b/reference/format2.txt @@ -26,7 +26,6 @@ file -w-w-w gpssim gpssim Franson GPSGate Simulation file rw---- fugawi txt Fugawi file rw---- garmin301 Garmin 301 Custom position and heartrate file --rw-- garmin_g1000 csv Garmin G1000 datalog input filter file -file --rw-- glogbook xml Garmin Logbook XML file rwrwrw gdb gdb Garmin MapSource - gdb file rwrwrw garmin_txt txt Garmin MapSource - txt (tab delimited) file rw---- garmin_poi Garmin POI database @@ -46,7 +45,6 @@ serial r-r--- dg-200 GlobalSat DG-200 Download serial --r--- globalsat GlobalSat GH625XT GPS training watch file --r--- googledir xml Google Directions XML file rwrwrw kml kml Google Earth (Keyhole) Markup Language -file --rw-- gnav_trl trl Google Navigator Tracklines (.trl) file --rw-- land_air_sea txt GPS Tracking Key Pro text file rwrwrw gtm gtm GPS TrackMaker file rw---- arc txt GPSBabel arc filter file diff --git a/reference/format3.txt b/reference/format3.txt index bd42134e2..0d5d28b55 100644 --- a/reference/format3.txt +++ b/reference/format3.txt @@ -258,8 +258,6 @@ option garmin_g1000 prefer_shortnames Use shortname instead of description boole option garmin_g1000 datum GPS datum (def. WGS 84) string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_g1000.html#fmt_garmin_g1000_o_datum -file --rw-- glogbook xml Garmin Logbook XML glogbook - https://www.gpsbabel.org/WEB_DOC_DIR/fmt_glogbook.html file rwrwrw gdb gdb Garmin MapSource - gdb gdb https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gdb.html option gdb cat Default category on output (1..16) integer 1 16 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gdb.html#fmt_gdb_o_cat @@ -468,8 +466,6 @@ option kml rotate_colors Rotate colors for tracks and routes (default automatic) option kml prec Precision of coordinates, number of decimals integer 6 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_kml.html#fmt_kml_o_prec -file --rw-- gnav_trl trl Google Navigator Tracklines (.trl) gnav_trl - https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gnav_trl.html file --rw-- land_air_sea txt GPS Tracking Key Pro text xcsv https://www.gpsbabel.org/WEB_DOC_DIR/fmt_land_air_sea.html option land_air_sea snlen Max synthesized shortname length integer 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_land_air_sea.html#fmt_land_air_sea_o_snlen diff --git a/reference/help.txt b/reference/help.txt index 044c172ea..3f072052a 100644 --- a/reference/help.txt +++ b/reference/help.txt @@ -137,7 +137,6 @@ File Types (-i and -o options): urlbase Basename prepended to URL on output prefer_shortnames (0/1) Use shortname instead of description datum GPS datum (def. WGS 84) - glogbook Garmin Logbook XML gdb Garmin MapSource - gdb cat Default category on output (1..16) bitscategory Bitmap of categories @@ -236,7 +235,6 @@ File Types (-i and -o options): max_position_point Retain at most this number of position points (0 rotate_colors Rotate colors for tracks and routes (default autom prec Precision of coordinates, number of decimals - gnav_trl Google Navigator Tracklines (.trl) land_air_sea GPS Tracking Key Pro text snlen Max synthesized shortname length snwhite (0/1) Allow whitespace synth. shortnames diff --git a/testo.d/glogbook.test b/testo.d/glogbook.test deleted file mode 100644 index a85f8866a..000000000 --- a/testo.d/glogbook.test +++ /dev/null @@ -1,11 +0,0 @@ -# -# Garmin logbook. This format has an extra section (lap data with things -# like heartbeat and calories burned) that we don't know what to do with, -# so we convert it to gpx, convert it to itself, convert THAT to gpx, and -# compare those. -# -rm -f ${TMPDIR}/glogbook* -gpsbabel -i glogbook -f ${REFERENCE}/track/garmin_logbook.xml -o gpx -F ${TMPDIR}/glog1.gpx -gpsbabel -i glogbook -f ${REFERENCE}/track/garmin_logbook.xml -o glogbook -F ${TMPDIR}/glog.xml -gpsbabel -i glogbook -f ${TMPDIR}/glog.xml -o gpx -F ${TMPDIR}/glog2.gpx -compare ${TMPDIR}/glog1.gpx ${TMPDIR}/glog2.gpx diff --git a/testo.d/gnav_trl.test b/testo.d/gnav_trl.test deleted file mode 100644 index 5a1e2e44c..000000000 --- a/testo.d/gnav_trl.test +++ /dev/null @@ -1,10 +0,0 @@ - -# -# Google Navigator tracklines -# -gpsbabel -i gnav_trl -f ${REFERENCE}/track/gnav_trl.trl -t -o unicsv,utc=0 -F ${TMPDIR}/gnav_trl~trl.csv -compare ${REFERENCE}/track/gnav_trl~trl.csv ${TMPDIR}/gnav_trl~trl.csv -gpsbabel -i gnav_trl -f ${REFERENCE}/track/gnav_trl.trl -o gnav_trl -F ${TMPDIR}/gnav_trl.trl -gpsbabel -i gnav_trl -f ${TMPDIR}/gnav_trl.trl -t -o unicsv,utc=0 -F ${TMPDIR}/gnav_trl~trl2.csv -compare ${REFERENCE}/track/gnav_trl~trl.csv ${TMPDIR}/gnav_trl~trl2.csv - diff --git a/vecs.cc b/vecs.cc index 8e0939c2d..a106b716f 100644 --- a/vecs.cc +++ b/vecs.cc @@ -103,7 +103,6 @@ extern ff_vecs_t wbt_svecs; #if MAXIMAL_ENABLED extern ff_vecs_t wbt_fvecs; //extern ff_vecs_t wbt_fvecs; -extern ff_vecs_t glogbook_vecs; extern ff_vecs_t vcf_vecs; extern ff_vecs_t google_dir_vecs; extern ff_vecs_t tomtom_vecs; @@ -126,7 +125,6 @@ extern ff_vecs_t destinator_itn_vecs; extern ff_vecs_t destinator_trl_vecs; extern ff_vecs_t igo8_vecs; extern ff_vecs_t mapasia_tr7_vecs; -extern ff_vecs_t gnav_trl_vecs; extern ff_vecs_t navitel_trk_vecs; extern ff_vecs_t ggv_ovl_vecs; extern ff_vecs_t itracku_vecs; @@ -189,7 +187,6 @@ struct Vecs::Impl #if MAXIMAL_ENABLED LegacyFormat wbt_ffmt {wbt_fvecs}; //LegacyFormat wbt_ffmt {wbt_fvecs}; - LegacyFormat glogbook_fmt {glogbook_vecs}; LegacyFormat vcf_fmt {vcf_vecs}; LegacyFormat google_dir_fmt {google_dir_vecs}; LegacyFormat tomtom_fmt {tomtom_vecs}; @@ -225,7 +222,6 @@ struct Vecs::Impl HumminbirdFormat humminbird_fmt; HumminbirdHTFormat humminbird_ht_fmt; LegacyFormat mapasia_tr7_fmt {mapasia_tr7_vecs}; - LegacyFormat gnav_trl_fmt {gnav_trl_vecs}; LegacyFormat navitel_trk_fmt {navitel_trk_vecs}; LegacyFormat ggv_ovl_fmt {ggv_ovl_vecs}; LegacyFormat itracku_fmt {itracku_vecs}; @@ -720,13 +716,6 @@ struct Vecs::Impl "tr7", nullptr, }, - { - &gnav_trl_fmt, - "gnav_trl", - "Google Navigator Tracklines (.trl)", - "trl", - nullptr, - }, { &navitel_trk_fmt, "navitel_trk", diff --git a/xmldoc/formats/glogbook.xml b/xmldoc/formats/glogbook.xml deleted file mode 100644 index 82a05b2f0..000000000 --- a/xmldoc/formats/glogbook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - This is the XML format used by the Garmin Logbook product - that ships with Forerunner and Foretrex. - As of early 2006, this program is apparently been discontinued in favor of - Garmin Training Center. - - See: http://www.garmin.com - - diff --git a/xmldoc/formats/gnav_trl.xml b/xmldoc/formats/gnav_trl.xml deleted file mode 100644 index 06cf6708d..000000000 --- a/xmldoc/formats/gnav_trl.xml +++ /dev/null @@ -1,45 +0,0 @@ - - Binary (little endian) tracklogs containing coordinates, timestamps and altitude values. - - - - Google Navigator is an application for PDAs - running under Windows Mobile 5.0 or 6.0. - - - - - Track point structure (16 bytes) - - - - Position - Data type - Field info - - - - - 0 - 32-bit signed int - Unix timestamp - - - 4 - 32-bit float - Latitude - - - 8 - 32-bit float - Longitude - - - 12 - 32-bit float - Altitude (!rotated left by eight bits!) - - - -
- -- 2.30.2